From: Kenichi Handa <handa@m17n.org>
Date: Wed, 25 Aug 2010 08:15:45 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6837^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4d70f6742e48857d5c1ff8c89cb5d34ae27928c8;p=emacs.git

merge trunk
---

4d70f6742e48857d5c1ff8c89cb5d34ae27928c8
diff --cc lisp/ChangeLog
index 57185cea350,2b348842656..01a49cab0d8
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,8 +1,16 @@@
 +2010-08-25  Kenichi Handa  <handa@m17n.org>
 +
 +	* language/misc-lang.el ("Arabic"): New language environment.
 +	Setup composition-function-table for Arabic characters.
 +
 +	* international/fontset.el (setup-default-fontset): Fix typo for
 +	arabic OTF spec (fini->fina).
 +
+ 2010-08-25  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+ 	* menu-bar.el (menu-bar-set-tool-bar-position): Set frame parameter
+ 	on all frames.
+ 
  2010-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
  
  	* whitespace.el: Allow cleaning up blanks without blank